*** empty log message ***

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b75d1d27c6f479941e3140120e1e975614afb840..d92ba2ebf36a648de65ac17959ba8191845515cc 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,7 +1,20 @@
+<<<<<<< ChangeLog
+2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+       * tramp.texi (History): Add IMAP support.
+       (External methods): Add `imap' and `imaps' methods.
+       (GVFS based methods): Add indices for `davs'.
+       (Password handling): Rename anchors.  Add IMAP entries for
+       ~/.authinfo.gpg.
+
+       * trampver.texi: Set default value of `emacsimap'.
+
+=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
        * gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
+>>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * dired-x.texi (Technical Details): Delete